Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix JRA55do inputs #123

Merged
merged 6 commits into from
Sep 20, 2024
Merged

fix JRA55do inputs #123

merged 6 commits into from
Sep 20, 2024

Conversation

aekiss
Copy link
Contributor

@aekiss aekiss commented Sep 16, 2024

This PR replaces #113.

When cherry-picked to other branches, this will addresses
COSIMA/access-om3#208
COSIMA/om3-scripts#27
COSIMA/om3-scripts#29

Separate commits are used to facilitate the differing PRs needed for different configs (e.g. IAF).

@aekiss
Copy link
Contributor Author

aekiss commented Sep 17, 2024

Oops, I should've used /g/data/vk83/configurations instead of /g/data/vk83/experiments. I'll fix it.

Copy link
Contributor

@ezhilsabareesh8 ezhilsabareesh8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aekiss, it looks good to me and it is running. I changed the data mode in the code refer here, we also need to change the executable and the data mode in datm_in.

@aekiss
Copy link
Contributor Author

aekiss commented Sep 18, 2024

Thanks @ezhilsabareesh8 has COSIMA/access-om3@96f9159 been built? It's not in /g/data/ik11/spack/0.21.2/modules/access-om3/0.x.0/linux-rocky8-cascadelake/access-om3/

@aekiss
Copy link
Contributor Author

aekiss commented Sep 20, 2024

PR now updated to use /g/data/vk83/configurations and datamode=JRA55do with updated exe. Test run seems ok.

@ezhilsabareesh8 can you have another look and approve if this look ok?

Copy link
Contributor

@ezhilsabareesh8 ezhilsabareesh8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aekiss, it looks good to me. It is running and the data mode is JRA55do in atm.log.

@aekiss aekiss merged commit a5fd61b into dev-1deg_jra55do_ryf Sep 20, 2024
@aekiss aekiss deleted the 1deg_jra55do_ryf.issue.208 branch September 20, 2024 03:36
@anton-seaice
Copy link
Contributor

!cherry-pick 3933627..a5fd61b into dev-1deg_jra55do_ryf_wombatlite

Copy link

!cherry-pick 3933627..a5fd61b into dev-1deg_jra55do_ryf_wombatlite

Automatic cherry-pick failed. Could not find commit(s) 3933627904916c7b08c54950abaf2abce0c23ad3..a5fd61b2c5b79556ef8a873f9f23f291796641b2 in dev-1deg_jra55do_ryf.

@anton-seaice
Copy link
Contributor

!cherry-pick 3933627 db5e8e8 654dbd7 3e83923 1707a79 a5fd61b into dev-1deg_jra55do_ryf_wombatlite

Copy link

Automatic Git cherry-picking of commit(s) 3933627 db5e8e8 654dbd7 3e83923 1707a79 a5fd61b into dev-1deg_jra55do_ryf_wombatlite failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
git checkout dev-1deg_jra55do_ryf_wombatlite
git pull
git checkout -b cherry_pick_from_pr123_into_dev-1deg_jra55do_ryf_wombatlite
  1. Cherry-pick commits:
git cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2
  1. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  2. Push the new branch:
git push --set-upstream origin cherry_pick_from_pr123_into_dev-1deg_jra55do_ryf_wombatlite
  1. Open a new pull request on github making sure the target branch is set to dev-1deg_jra55do_ryf_wombatlite.

@anton-seaice
Copy link
Contributor

!cherry-pick 3933627 db5e8e8 654dbd7 3e83923 1707a79 a5fd61b into dev-025deg_jra55do_ryf

Copy link

!cherry-pick 3933627 db5e8e8 654dbd7 3e83923 1707a79 a5fd61b into dev-025deg_jra55do_ryf

Automatic cherry-pick failed. Could not find commit(s) https://github.com/ACCESS-NRI/access-om3-configs/commit/3933627904916c7b08c54950abaf2abce0c23ad3 https://github.com/ACCESS-NRI/access-om3-configs/commit/db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 https://github.com/ACCESS-NRI/access-om3-configs/commit/654dbd78088208812de94fea87a9d43cb194cefa https://github.com/ACCESS-NRI/access-om3-configs/commit/3e839234e6dd762161473b8b7625dbfd61bf6663 https://github.com/ACCESS-NRI/access-om3-configs/commit/1707a792ecadc1a39df2cdf110ad95290bab51e8 https://github.com/ACCESS-NRI/access-om3-configs/commit/a5fd61b2c5b79556ef8a873f9f23f291796641b2 in dev-1deg_jra55do_ryf.

@anton-seaice
Copy link
Contributor

!cherry-pick 3933627 db5e8e8 654dbd7 3e83923 1707a79 a5fd61b into dev-025deg_jra55do_ryf

Copy link

Automatic Git cherry-picking of commit(s) 3933627 db5e8e8 654dbd7 3e83923 1707a79 a5fd61b into dev-025deg_jra55do_ryf failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
git checkout dev-025deg_jra55do_ryf
git pull
git checkout -b cherry_pick_from_pr123_into_dev-025deg_jra55do_ryf
  1. Cherry-pick commits:
git cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2
  1. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  2. Push the new branch:
git push --set-upstream origin cherry_pick_from_pr123_into_dev-025deg_jra55do_ryf
  1. Open a new pull request on github making sure the target branch is set to dev-025deg_jra55do_ryf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants